Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 5 Sep 2011 00:16:40 +0000 (17:16 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 5 Sep 2011 00:16:40 +0000 (17:16 -0700)
commit541215cecc9270dc7fd2d646284193b231658abf
treeac31f6c51cd25c0944b543466b012efd46eea260
parente7d4b0f3cab97b6b4f58aab1e71d47b55563675a
parent1bac7b54b023ad5324ef8f79c324266ea6e383bc
Merge from trunk.